merge r27132
authorJo-Philipp Wich <[email protected]>
Tue, 7 Jun 2011 23:26:52 +0000 (23:26 +0000)
committerJo-Philipp Wich <[email protected]>
Tue, 7 Jun 2011 23:26:52 +0000 (23:26 +0000)
commita57940fd48ef746c4eec893fd2e1d9b147483fbd
treeaa464f5da898adc0fe6b1205cb74cdbb0227fcf6
parent9a88a471e3754636ad95e40025439593ade3af6e
merge r27132

SVN-Revision: 27133
package/base-files/Makefile
package/base-files/files/lib/network/config.sh
package/base-files/files/sbin/ifup